panel: Defer adding the user status menu to the manager

PopupMenuManager relies on menus being added in the order of the
menu buttons they are attached to, so defer adding the user status
menu until the status icon menus have been added to make the manager
happy.

diff --git a/js/ui/panel.js b/js/ui/panel.js
index 1c23ae8d0a48682fb52cb1c9407ef5a318d71e95..4cedb442b05a7b10216a43056c00391b92580ebd 100644 (file)
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -874,7 +874,6 @@ Panel.prototype = {
 
         this._statusmenu = new StatusMenu.StatusMenuButton();
         this._statusmenu.actor.name = 'panelStatus';
-        this._menus.addMenu(this._statusmenu.menu);
         this._rightBox.add(this._statusmenu.actor);
 
         // Synchronize the buttons pseudo classes with its corner
@@ -951,6 +950,10 @@ Panel.prototype = {
             this._statusBox.add(indicator.actor);
             this._menus.addMenu(indicator.menu);
         }
+
+        // PopupMenuManager depends on menus being added in order for
+        // keyboard navigation
+        this._menus.addMenu(this._statusmenu.menu);
     },
 
     startupAnimation: function() {